Fixes after tonight's merge round#6898
Merged
weaverryan merged 4 commits intosymfony:2.7from Aug 21, 2016
Merged
Conversation
As i now starts at 1 and cycle() uses the modulo operator, the second list item is used for the first element. This means odd/even have to be switched. See http://twigfiddle.com/8amvok
* Replaced "goes to" with "visits"; * Removed wrong `/` at the end of a route name (it was confused with an actual URI); * Reindented the PHP example to be more readable.
Contributor
|
These all makes sense for me! Thanks for the good commit messages - made understanding what you were thinking very easy :). Cheers! |
weaverryan
added a commit
that referenced
this pull request
Aug 21, 2016
This PR was merged into the 2.7 branch. Discussion ---------- Fixes after tonight's merge round Some fixes after the merged changes by @weaverryan last night. See the commit messages for more details about the changes. Commits ------- 8e66547 [Console] Focus on framework users first in the guides cf4022e [Routing] Some minor tweaks to the placeholder doc 296a0a0 [Templating] Fix odd/even cycle bbef239 [Contributing] Minor grammar fix
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Some fixes after the merged changes by @weaverryan last night. See the commit messages for more details about the changes.